Cset 8950 adds shadow info dump in common code, however

IA64 has no shadow mode. Move it into arch specific stub instead.

Signed-off-by Kevin Tian <kevin.tian@intel.com>

diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c
index e73fab753eaa76839b55339ad1fb549e4c5db268..375d88f76cac3ba81e5d7ff28dac13b19f8b2fc8 100644 (file)
--- a/xen/arch/ia64/xen/xenmisc.c
+++ b/xen/arch/ia64/xen/xenmisc.c
@@ -336,6 +336,10 @@ void continue_running(struct vcpu *same)
        /* nothing to do */
 }
 
+void arch_dump_domain_info(struct domain *d)
+{
+}
+
 void panic_domain(struct pt_regs *regs, const char *fmt, ...)
 {
        va_list args;

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index ee0bada316e57e194a4471a6f4d18247be58f35d..1cec5b9aa016ec7057459c214f31190de9e06ece 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -986,6 +986,26 @@ void domain_relinquish_resources(struct domain *d)
     relinquish_memory(d, &d->page_list);
 }
 
+void arch_dump_domain_info(struct domain *d)
+{
+    if ( shadow_mode_enabled(d) )
+    {
+        printk("    shadow mode: ");
+        if ( shadow_mode_refcounts(d) )
+            printk("refcounts ");
+        if ( shadow_mode_write_all(d) )
+            printk("write_all ");
+        if ( shadow_mode_log_dirty(d) )
+            printk("log_dirty ");
+        if ( shadow_mode_translate(d) )
+            printk("translate ");
+        if ( shadow_mode_external(d) )
+            printk("external ");
+        if ( shadow_mode_wr_pt_pte(d) )
+            printk("wr_pt_pte ");
+        printk("\n");
+    }
+}
 
 /*
  * Local variables:

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 0e9bd97e2216e34e015bfcd46ce052501adcb6e3..1b06e0dc3aebf2be9493d4e2843e5fa806b8a6ee 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -132,22 +132,8 @@ static void dump_domains(unsigned char key)
                d->handle[ 4], d->handle[ 5], d->handle[ 6], d->handle[ 7],
                d->handle[ 8], d->handle[ 9], d->handle[10], d->handle[11],
                d->handle[12], d->handle[13], d->handle[14], d->handle[15]);
-        if ( shadow_mode_enabled(d) ) {
-            printk("    shadow mode: ");
-            if ( shadow_mode_refcounts(d) )
-                printk("refcounts ");
-            if ( shadow_mode_write_all(d) )
-                printk("write_all ");
-            if ( shadow_mode_log_dirty(d) )
-                printk("log_dirty ");
-            if ( shadow_mode_translate(d) )
-                printk("translate ");
-            if ( shadow_mode_external(d) )
-                printk("external ");
-            if ( shadow_mode_wr_pt_pte(d) )
-                printk("wr_pt_pte ");
-            printk("\n");
-        }
+
+        arch_dump_domain_info(d);
 
         rangeset_domain_printk(d);
 

diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h
index 4fee8e74cb39474913bd610685570150c9f1554a..aa38ac0fc611798f8337d37a4fcb80439786de03 100644 (file)
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -24,4 +24,6 @@ extern void domain_relinquish_resources(struct domain *d);
 
 extern void dump_pageframe_info(struct domain *d);
 
+extern void arch_dump_domain_info(struct domain *d);
+
 #endif /* __XEN_DOMAIN_H__ */